Style: Fixed a few layout kinks