Update to v1.05 BETA

Changed some methods, improved gui behaviour and cleaned the code a bit
in order to get it easier to edit and understand. Some comments added as
well.