Layout code modified