bug fix on new layout