Styling

I changed a lot, so take a good look and make sure that everything still looks good.