fixing UI issues and url breaking issue