Started on UI

+Minor UI Changes