Twitter bootstrap - work in progress!
Main page layout fixes
Merge