updated settings section and interweaved with user token