working on UI, cleaning, just cleaning!