refactorin 'me' page