Finish layout and users-management