Clean up styles
Clean up default template markup