Next / prev updates

Next / prev updates and styling improvements.