Changed plus color and fixed button clicks