Fixed dispatch and updated design of some other pages, have a TODO list