Cleaned up module structure. Added cancel button on edit view.