Replaced the gui lists by enums, formatted code and some other things