Some more gui changes and general cleanup