Improvements on lint layout.