Junk/refactor html arch