Adding improvement to GUI.
Refactorising.