formated tooltips & started refactoring controllers