Fixing some styling issues