Finished 2.2 functionality (GUI) except routes