Added small layout fixes