Updated Design to Expandable and Dialogs

(Dialogs for Adding/Editing)