Fixed merge conflict.
Fixed a rendering issue in Firefox; also moved some styles to a more appropriate place.
Fixed some homepage layout issues.
Removed the reduction from 25% with down to 20% at higher resolutions; stays 25% now
Fixed merge conflicts
Removing some unused styles from twitter bootstrap.