Fix some stylings bugs