fixed some issues with layout