Fixed most of the bad UI design