Minor styling changes
A couple other minor changes