Fixed minor alignment/spacing issues