Fix On Tap Dashboard