Auth and layout improvements