Basvi-Bug Fixes

Alignment Issues