Bugfixes
#2, #5
Added UpdateButton logic
Some refactoring.