Fixed a few layout problems... (It's messy, I know..)