Fix rendering on blocks in edit mode
Clean-up back button handler