Layout bug fixes - 2