- committing code from Markus Ottenbacher for cleaned-up panel navigation