Finished main improvements for GUI