Fixed GUI. Moved some Models into actionListeners