Fixed small UI issues - Lot of issues are still pending