revised model, moved profile page