Added base layout for user page and several improvements