small layout fixes & improvements