Improve decoration and pagination layouts