Fix some styling issues, etc