GUI refinement, removing cancel
Added comments and fixed bugs.