fixed issues with the layout