Cleaned up UI, added cancel confirmation, and genearal fixes.
Resolved merge conflicts.