Minor Improvements in Layouts