Clickable headers to go back
commented code & bugfix