#516 Another bunch of improvements
#371 Create a sepparate update page