many content and layout fixes