Fixed navigation + tweaked rendering