bugs in layout are fixed