Fix navigation bugs, updates screenshot