Fixed controller in GUI classes