Fix bugs with previous/next, add tooltips and some formatting