Employed cached selector, trimmed buttons
Trimmed more buttons