Bring back Account Settings page, add some TODOs where we need code