Added Edit support for the application stack. Still buggy