Fixed bug in layout