Place horizontal rules, refactor disabling elements, update tasks