fixed some of the layout