GUI Improvements + some cleaning up