some more changes (breaks side bar)