Improved layout when authority control is enabled