cleaning and layout fixes