layout and bug fixs