went back to two functions on the me page

still didn't fix the re-ordering issue will likely refers changes