Removed GUI issues