Added a lot of ui stuff