Small changes to buttons, still need work - David