Final GUI update and various fixes
Final GUI update and various fixes