Performance-ish and refactor-ish

Change the position for the back-button + small changes after Hein-refactoring.