Adding popover for add button
Cleaning markup
Cleaning markup
Reorganizing application
Reorganizing application