More button classes added, more clean ups.