Revert "Fixed Alignment"

This reverts commit 813dc70e52722397b78aa07761a5c5676bf6abf6.
Revert "Revert "Fixed Alignment""

This reverts commit cd626544164a21872a1de9a98b2c54f22b69e67f.