Further Handbook Layout Fixes