a few bug fixes and style sheet adjustment