Improvements on layout