Shahin's changes, with Talak's user menu related changes