Some small layout fixes