Menu/pagination/buttons layoout improved