Bug fixing and layout changing.
Added function to the add/minus buttons.