Better auth support
Many layout changes