Added more hacks, anchor to contents