Small Changes to Lay-Out