fixed issues with layout