bugfix and back buttons