Fix several styling issues