Fixes for better vertical spacing