fixed bug in layout
removed debugigng messages