Fixes for styling