several small layout fixes