Check-In Window Fixes

Fixed alignment issues in Ivan's code.