Reworked things, finished page