More coherent auth layout structure