Layout and Login updates