Settings page and profile page improvements