Fixes to alignment, text clipping, UI stuff