Made a lot of changes, the ui is almost done.