Fixed GUI. Moved some Models into actionListeners
Merge origin/master