GUI changed and cleaned up