Fixed some style and alignment