added personal cabinet page
fixed merge conflict