Somewhat completed UI

Still need lots of testing - I think there are some bugs