New UI

Pushed the changes from a long time ago to a new branch, for further consideration. If there have been any updates (or anything more that would potentially help make for a better UI), let me know!