Fixed merge issues

Went through every page, their shouldn't be any more issues as a reslut
of merging