some changes in the layout to add a more common page structure
fixed bug in previous layout change