Working commit: merged Add & Edit + cosmetics and polishing