moved things around + added other pages