multiple ux fixes
remove console.logs
buttons fix
Merge pull request #113 from matiu/feature/ux11

Feature/ux11
fix conflict