Removed cancel button
Refactor in progress
Fix #34