fixed bug with layout