some fixes and layout changes