Fixed multiple page support, added top navbar