refactoring some of the class stuff for the gui
fix tab error introduced playing with sublime text