Work on UI and validation
Remove useless classes