Fixed some problems, finished more of UI