Fix and improve Twitter Bootstrap compatible template