More improvements - Changing GUI's is now easier