Fix controller n layouts