moved actionable styling to its own sheet
fixed merge conflicts