Started to pretty up UI
Also cleaned up some code.