switched css classes for modal containers where it made more sense
Merge remote-tracking branch 'origin/mockup-design' into mockup-design
used shifty for transitions instead of home made animation code