Tidying Controller layout
revert if needed