more tweaks, reworking navigation