Various bug fixes and adjustments to the overview pages