cleaned some things up...still need to do something about the nav arrows