refactoring & user ui initial dev