GUI completely changed, some minor code changes and cleaning of unuseful
code