Refactored page layout and added user setting page