Improved GUI and created mapping-classes