Added user selection on main page