made pages pretty
merge
everything