Added some small layout changes