added some more gui, moving towards MVC