Alignment and Rendering Fixes