Last changes
Before new design
Update UI & logic.