Finished restyling UI

Close #47
Started on #12