Davey's tables added, Sidebar completed
merged working version