Fixed some right align