Changed button name
Fix quick add logic to do math right for main view
Add fix for math