Fixed issues with alignment