Still trying to fix edit functionality.
Made a few changes to the interface.