Pull the user details into the account page

also "making the modules easier to manage"