fixed UI Issues and few other bugs