Panels and controller little refactoring, putting stuff where they belong