Layout bug fix