Included editing and adding capabilities
Autolayout fixes