Integrated the account page more into the theme