major skeleton page refactoring and additions