moved around and added some classes