part 1 of user-panel update
Merge pull request #5 from codeFareith/user-panel

part 1 of user-panel update