ARQUIDEAS-1313 # Styling fixes