fixes and layout