added data and pubs, removed sidebar