Added layout changes and User controller