bug fixes and layout/design changes