fix buglets in laylut