Some fixes and remember your position when changing views