Update for cleanup and role security
update for layout and register button