Resolved some style bugs