general and styling fixes