changing icons and simplifying paginate
icon and layout tweaks and fixes