Revert "Fixed alignment issues"

This reverts commit ee2fa11b1c2e8002177a89d794dd019c3ac74f9b.
Fixed aligment issues properly