Layout bug fixed