fixed display issue (scrollbars) and minor bugs