Fixed some small layout changes