spacing and layout fixes