Fix annotations
Add small button styling as variable styling
More styling updates