Added save and restore of current position after oncreate