moved things
more html changes