Refactor some stuff + delete pushstate for now