Small refactors to make the page more dynamic.