GUI enhancement (working on MVC)