keeping button style up
Consolidate code, bring code in line