Revert "Style issue fix."

This reverts commit e6f28e228bf77cb1747dd086f846eb1b3218ce21.
Revert "Remove plus/minus buttons."

This reverts commit 0018b63e28b96c9f4fce6e8201b7736ac9439d20.