layauts finished
bug fixed