Minor Fixes to layout