refactored
fixed ui