Making it pretty

Working on the UI