Minor bugfixes and easier navigation