Changed controller layouts