fix small bug due to merging switching layout