added events to shapeshift, additional entries in db, moved some views