I changed the layout quite a bit. I think I like this new one a lot better, even though the border is kinda messed up at the right.