Small cleaning up and further work on UI elements