misc design and layout fixes