general layout fixes and styling