fixing css and minor bugs