refactered names and started user setting ui