move stuff around and fix overwrite of intro page