minor fixes and layout improvements