Do some fixes for the page layout