diff --git a/LICENSE b/LICENSE
index d8795f0..20d40b6 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,28 +1,674 @@
-Copyright (c) 2012, Roland SAIKALI
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of the author nor the names of other
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
\ No newline at end of file
diff --git a/skwissh/cron.py b/skwissh/cron.py
index 54de12f..e769294 100644
--- a/skwissh/cron.py
+++ b/skwissh/cron.py
@@ -110,10 +110,7 @@ def storeValue(server, probe, timestamp, server_up):
             success = False
 
         if not success:
-            if probe.graph_type.name == 'text':
-                output = "No data"
-            else:
-                output = "0"
+            output = "No data" if probe.graph_type.name == 'text' else "0"
 
         if probe.graph_type.name == 'text':
             Measure.objects.filter(server=server, probe=probe).delete()
@@ -161,7 +158,7 @@ def calculateAverage(period, classname):
     for server in Server.objects.all().select_related():
         try:
             threads = []
-            for probe in server.probes.filter(graph_type__name__in=['linegraph', 'bargraph', 'pie']):
+            for probe in server.probes.exclude(graph_type__name__in=['text']):
                 thread = threading.Thread(target=calculateAveragesForPeriod, args=[period, classname, server, probe], name="SkwisshAverage.%s.%s" % (classname.__name__, probe.display_name.encode('utf-8').replace(" ", "_")))
                 thread.setDaemon(False)
                 thread.start()
diff --git a/skwissh/fields.py b/skwissh/fields.py
index 2de1521..aec54d6 100644
--- a/skwissh/fields.py
+++ b/skwissh/fields.py
@@ -27,7 +27,7 @@ def get_db_prep_value(self, value, connection, prepared=False):
         if value is not None and not isinstance(value, EncryptedString):
             padding = self.cipher.block_size - len(value) % self.cipher.block_size
             if padding and padding < self.cipher.block_size:
-                value += "\0" + ''.join([random.choice(string.printable) for i in range(padding - 1)])
+                value += "\0" + ''.join([random.choice(string.printable) for i in range(padding - 1)])  # @UnusedVariable 'i'
             value = EncryptedString(binascii.b2a_hex(self.cipher.encrypt(value)))
         return value
 
diff --git a/skwissh/fixtures/initial_data.json b/skwissh/fixtures/initial_data.json
index 7c9243b..f50f688 100644
--- a/skwissh/fixtures/initial_data.json
+++ b/skwissh/fixtures/initial_data.json
@@ -4,34 +4,34 @@
 		"model": "skwissh.graphtype",
 		"fields": {
 			"date_created": "2012-05-20T10:07:47Z",
-			"date_modified": "2012-08-31T13:31:29.488Z",
+			"date_modified": "2012-09-08T14:29:10Z",
 			"name": "bargraph",
-			"options": "seriesColors: [ \"#7FAE00\", \"#EAA228\", \"#D5383B\", \"#4EA5B5\" ],\r\naxes: {\r\n    xaxis: {\r\n        renderer: $.jqplot.DateAxisRenderer,\r\n        min: minDate,\r\n        max: maxDate,\r\n        tickInterval: tickInt,\r\n        tickOptions: {\r\n            formatString: \"<center>%R<br/>%d %b</center>\",\r\n        },\r\n    },\r\n    yaxis: {\r\n        min:0,\r\n        autoscale: true,\r\n        tickOptions: {\r\n            formatString: \"<center>%.2f @UNITS@</center>\",\r\n        },\r\n    },\r\n},\r\nseriesDefaults: {\r\n    renderer:$.jqplot.BarRenderer,\r\n    shadow: false,\r\n    showMarker: false,\r\n    rendererOptions: {\r\n        barMargin: bMgin,\r\n    },\r\n    markerOptions: {\r\n        show: false,\r\n        size: 0,\r\n    },\r\n},\r\nhighlighter: {\r\n    show: true, \r\n    showLabel: true, \r\n    sizeAdjust: 1,\r\n    tooltipLocation : 'n',\r\n    useAxesFormatters: true,\r\n    tooltipAxes: 'both',\r\n    tooltipSeparator: '',\r\n},\r\ngrid: {\r\n    background: '#F2F2F2',\r\n},\r\ncursor: { \r\n    zoom: true, \r\n    style: 'default',\r\n    show: true,\r\n    constrainZoomTo: 'x',\r\n    constrainOutsideZoom: true,\r\n    showTooltip: false,\r\n},\r\n@SERIES@,\r\nanimate: true,\r\nanimateReplot: false,\r\nstackSeries: true,"
+			"options": "seriesColors: [ \"#7FAE00\", \"#EAA228\", \"#D5383B\", \"#4EA5B5\" ],\r\naxes: {\r\n    xaxis: {\r\n        renderer: $.jqplot.DateAxisRenderer,\r\n        tickOptions: {\r\n            formatString: \"<center>%R<br/>%d %b</center>\",\r\n        },\r\n    },\r\n    yaxis: {\r\n        min:0,\r\n        autoscale: true,\r\n        tickOptions: {\r\n            formatString: \"<center>%.2f @UNITS@</center>\",\r\n        },\r\n    },\r\n},\r\nseriesDefaults: {\r\n    renderer:$.jqplot.BarRenderer,\r\n    shadow: false,\r\n    showMarker: false,\r\n    markerOptions: {\r\n        show: false,\r\n        size: 0,\r\n    },\r\n},\r\nhighlighter: {\r\n    show: true, \r\n    showLabel: true, \r\n    sizeAdjust: 1,\r\n    tooltipLocation : 'n',\r\n    useAxesFormatters: true,\r\n    tooltipAxes: 'both',\r\n    tooltipSeparator: '',\r\n},\r\ngrid: {\r\n    background: '#F2F2F2',\r\n},\r\ncursor: { \r\n    zoom: true, \r\n    style: 'default',\r\n    show: true,\r\n    constrainZoomTo: 'x',\r\n    constrainOutsideZoom: true,\r\n    showTooltip: false,\r\n},\r\nanimate: true,\r\nanimateReplot: false,\r\nstackSeries: true,"
 		}
 	}, {
 		"pk": 1,
 		"model": "skwissh.graphtype",
 		"fields": {
 			"date_created": "2012-05-17T18:01:01Z",
-			"date_modified": "2012-08-30T16:55:11.368Z",
+			"date_modified": "2012-09-08T14:29:21Z",
 			"name": "linegraph",
-			"options": "seriesColors: [ \"#7FAE00\", \"#EAA228\", \"#D5383B\", \"#4EA5B5\" ],\r\naxes: {\r\n    xaxis: {\r\n        renderer: $.jqplot.DateAxisRenderer,\r\n        min: minDate,\r\n        max: maxDate,\r\n        tickInterval: tickInt,\r\n        tickOptions: {\r\n            formatString: \"<center>%R<br/>%d %b</center>\",\r\n        },\r\n    },\r\n    yaxis: {\r\n        min:0,\r\n        autoscale: true,\r\n        tickOptions: {\r\n            formatString: \"<center>%.2f @UNITS@</center>\",\r\n        },\r\n    },\r\n},\r\nseriesDefaults: {\r\n    lineWidth:2,\r\n    shadow: false,\r\n    markerOptions: {\r\n        show: false,\r\n    },\r\n    rendererOptions: {\r\n        smooth: true,\r\n    },\r\n},\r\nhighlighter: {\r\n    show: true, \r\n    showLabel: true, \r\n    sizeAdjust: 1,\r\n    tooltipLocation : 'n',\r\n    useAxesFormatters: true,\r\n    tooltipAxes: 'both',\r\n    tooltipSeparator: '',\r\n},\r\ngrid: {\r\n    background: '#F2F2F2',\r\n},\r\ncursor: { \r\n    zoom: true, \r\n    style: 'default',\r\n    show: true,\r\n    constrainZoomTo: 'x',\r\n    constrainOutsideZoom: true,\r\n    showTooltip: false,\r\n},\r\n@SERIES@,\r\nanimate: true,\r\nanimateReplot: false,"
+			"options": "seriesColors: [ \"#7FAE00\", \"#EAA228\", \"#D5383B\", \"#4EA5B5\" ],\r\naxes: {\r\n    xaxis: {\r\n        renderer: $.jqplot.DateAxisRenderer,\r\n        tickOptions: {\r\n            formatString: \"<center>%R<br/>%d %b</center>\",\r\n        },\r\n    },\r\n    yaxis: {\r\n        min:0,\r\n        autoscale: true,\r\n        tickOptions: {\r\n            formatString: \"<center>%.2f @UNITS@</center>\",\r\n        },\r\n    },\r\n},\r\nseriesDefaults: {\r\n    lineWidth:2,\r\n    shadow: false,\r\n    markerOptions: {\r\n        show: false,\r\n    },\r\n    rendererOptions: {\r\n        smooth: true,\r\n    },\r\n},\r\nhighlighter: {\r\n    show: true, \r\n    showLabel: true, \r\n    sizeAdjust: 1,\r\n    tooltipLocation : 'n',\r\n    useAxesFormatters: true,\r\n    tooltipAxes: 'both',\r\n    tooltipSeparator: '',\r\n},\r\ngrid: {\r\n    background: '#F2F2F2',\r\n},\r\ncursor: { \r\n    zoom: true, \r\n    style: 'default',\r\n    show: true,\r\n    constrainZoomTo: 'x',\r\n    constrainOutsideZoom: true,\r\n    showTooltip: false,\r\n},\r\nanimate: true,\r\nanimateReplot: false,"
 		}
 	}, {
 		"pk": 2,
 		"model": "skwissh.graphtype",
 		"fields": {
 			"date_created": "2012-05-17T18:06:27Z",
-			"date_modified": "2012-08-31T09:04:44.235Z",
+			"date_modified": "2012-09-08T14:27:50Z",
 			"name": "pie",
-			"options": "seriesColors: [ \"#7FAE00\", \"#EAA228\", \"#D5383B\", \"#4EA5B5\" ],\r\nseriesDefaults: {\r\n    renderer: jQuery.jqplot.PieRenderer, \r\n    shadow: false,\r\n    rendererOptions: {\r\n        showDataLabels: true,\r\n        sliceMargin: 3,\r\n    },\r\n},\r\nhighlighter: {\r\n    show: true, \r\n    showTooltip: false,\r\n},\r\ncursor: {\r\n    show: false,\r\n},\r\ngrid: {\r\n    background: '#F2F2F2',\r\n},\r\n@SERIES@,"
+			"options": "seriesColors: [ \"#7FAE00\", \"#EAA228\", \"#D5383B\", \"#4EA5B5\" ],\r\nseriesDefaults: {\r\n    renderer: jQuery.jqplot.PieRenderer, \r\n    shadow: false,\r\n    rendererOptions: {\r\n        showDataLabels: true,\r\n        sliceMargin: 3,\r\n    },\r\n},\r\nhighlighter: {\r\n    show: true, \r\n    showTooltip: false,\r\n},\r\ncursor: {\r\n    show: false,\r\n},\r\ngrid: {\r\n    background: '#F2F2F2',\r\n},"
 		}
 	}, {
 		"pk": 3,
 		"model": "skwissh.graphtype",
 		"fields": {
 			"date_created": "2012-05-20T10:07:47Z",
-			"date_modified": "2012-08-30T11:33:24.279Z",
+			"date_modified": "2012-08-30T11:33:24Z",
 			"name": "text",
 			"options": ""
 		}
@@ -39,7 +39,7 @@
 		"pk": 3,
 		"model": "skwissh.probe",
 		"fields": {
-			"date_modified": "2012-08-31T12:08:16.877Z",
+			"date_modified": "2012-08-31T12:08:16Z",
 			"addon_name": "",
 			"display_name": "CPU (Usage)",
 			"ssh_command": "top -d0.2 -bn2 | grep \"Cpu\"",
@@ -54,7 +54,7 @@
 		"pk": 6,
 		"model": "skwissh.probe",
 		"fields": {
-			"date_modified": "2012-08-29T10:11:26.369Z",
+			"date_modified": "2012-08-29T10:11:26Z",
 			"addon_name": "",
 			"display_name": "CPU (Wait IO)",
 			"ssh_command": "top -d0.2 -bn2 | grep \"Cpu\"",
@@ -69,7 +69,7 @@
 		"pk": 4,
 		"model": "skwissh.probe",
 		"fields": {
-			"date_modified": "2012-08-29T12:32:18.372Z",
+			"date_modified": "2012-08-29T12:32:18Z",
 			"addon_name": "Ubuntu 12.04",
 			"display_name": "Disk Usage",
 			"ssh_command": "df -h / | tail -1",
@@ -84,7 +84,7 @@
 		"pk": 2,
 		"model": "skwissh.probe",
 		"fields": {
-			"date_modified": "2012-08-29T10:08:49.029Z",
+			"date_modified": "2012-08-29T10:08:49Z",
 			"addon_name": "",
 			"display_name": "Load",
 			"ssh_command": "cat /proc/loadavg",
@@ -99,37 +99,22 @@
 		"pk": 8,
 		"model": "skwissh.probe",
 		"fields": {
-			"date_modified": "2012-08-30T07:48:32.459Z",
+			"date_modified": "2012-08-30T07:48:32Z",
 			"addon_name": "",
 			"display_name": "Memory",
 			"ssh_command": "cat /proc/meminfo",
 			"probe_labels": "Free memory;Buffers;Used memory",
 			"use_sudo": false,
 			"probe_unit": "Mo",
-			"date_created": "2012-08-29T08:20:23.631Z",
+			"date_created": "2012-08-29T08:20:23Z",
 			"graph_type": 4,
 			"python_parse": "meminfos = dict([(info.split(':')[0].strip(), int(info.split()[1].strip())/1024) for info in output.splitlines()])\r\noutput = \";\".join([str(meminfos['MemFree']), str(meminfos['Buffers']), str(meminfos['MemTotal'] - meminfos['MemFree'] - meminfos['Buffers'])])"
 		}
-	}, {
-		"pk": 9,
-		"model": "skwissh.probe",
-		"fields": {
-			"date_modified": "2012-08-30T09:17:37.221Z",
-			"addon_name": "",
-			"display_name": "Memory (Swap)",
-			"ssh_command": "cat /proc/meminfo",
-			"probe_labels": "Free swap;Used swap",
-			"use_sudo": false,
-			"probe_unit": "Mo",
-			"date_created": "2012-08-29T08:42:29.645Z",
-			"graph_type": 4,
-			"python_parse": "meminfos = dict([(info.split(':')[0].strip(), int(info.split()[1].strip()) / 1024) for info in output.splitlines()])\r\noutput = \";\".join([str(meminfos['SwapFree']), str(meminfos['SwapTotal'] - meminfos['SwapFree'])])"
-		}
 	}, {
 		"pk": 7,
 		"model": "skwissh.probe",
 		"fields": {
-			"date_modified": "2012-08-31T09:02:39.186Z",
+			"date_modified": "2012-08-31T09:02:39Z",
 			"addon_name": "",
 			"display_name": "Memory (pie)",
 			"ssh_command": "cat /proc/meminfo",
@@ -140,18 +125,33 @@
 			"graph_type": 2,
 			"python_parse": "meminfos = dict([(info.split(':')[0].strip(), int(info.split()[1].strip())) for info in output.splitlines()])\r\noutput = \";\".join([str(meminfos['MemFree']), str(meminfos['Buffers']), str(meminfos['MemTotal'] - meminfos['MemFree'] - meminfos['Buffers'])])"
 		}
+	}, {
+		"pk": 9,
+		"model": "skwissh.probe",
+		"fields": {
+			"date_modified": "2012-08-30T09:17:37Z",
+			"addon_name": "",
+			"display_name": "Memory (Swap)",
+			"ssh_command": "cat /proc/meminfo",
+			"probe_labels": "Free swap;Used swap",
+			"use_sudo": false,
+			"probe_unit": "Mo",
+			"date_created": "2012-08-29T08:42:29Z",
+			"graph_type": 4,
+			"python_parse": "meminfos = dict([(info.split(':')[0].strip(), int(info.split()[1].strip()) / 1024) for info in output.splitlines()])\r\noutput = \";\".join([str(meminfos['SwapFree']), str(meminfos['SwapTotal'] - meminfos['SwapFree'])])"
+		}
 	}, {
 		"pk": 11,
 		"model": "skwissh.probe",
 		"fields": {
-			"date_modified": "2012-08-31T13:04:55.729Z",
+			"date_modified": "2012-08-31T13:04:55Z",
 			"addon_name": "",
 			"display_name": "Network data",
 			"ssh_command": "nstat | grep \"IpExt\"",
 			"probe_labels": "Received;Sent",
 			"use_sudo": false,
 			"probe_unit": "Ko",
-			"date_created": "2012-08-29T11:26:06.849Z",
+			"date_created": "2012-08-29T11:26:06Z",
 			"graph_type": 4,
 			"python_parse": "bdwth = dict([(info.split()[0].strip(), int(info.split()[1].strip()) / 1024) for info in output.splitlines()])\r\noutput = \";\".join([str(bdwth['IpExtInOctets']), str(bdwth['IpExtOutOctets'])])"
 		}
@@ -159,14 +159,14 @@
 		"pk": 10,
 		"model": "skwissh.probe",
 		"fields": {
-			"date_modified": "2012-08-29T10:04:52.393Z",
+			"date_modified": "2012-08-29T10:04:52Z",
 			"addon_name": "",
 			"display_name": "System idle time",
 			"ssh_command": "cat /proc/uptime",
 			"probe_labels": "Idle;Working",
 			"use_sudo": false,
 			"probe_unit": "",
-			"date_created": "2012-08-29T09:59:16.827Z",
+			"date_created": "2012-08-29T09:59:16Z",
 			"graph_type": 2,
 			"python_parse": "uptime = output.strip().split()\r\nuptime.reverse()\r\noutput = \";\".join(uptime)"
 		}
@@ -191,13 +191,13 @@
 		"fields": {
 			"username": "",
 			"is_measuring": false,
-			"date_modified": "2012-08-31T16:18:07.893Z",
+			"date_modified": "2012-09-08T16:01:03Z",
 			"ip": "127.0.0.1",
-			"hostname": "localhost",
+			"hostname": "Django Skwissh webserver",
 			"state": true,
 			"date_created": "2012-08-19T18:57:21Z",
 			"password": "",
-			"probes": [3, 6, 4, 2, 8, 9, 7, 11, 10, 5]
+			"probes": [3, 6, 4, 2, 8, 7, 9, 11, 10, 5]
 		}
 	}
 ]
\ No newline at end of file
diff --git a/skwissh/generic_views.py b/skwissh/generic_views.py
index 34b8696..793e6d3 100644
--- a/skwissh/generic_views.py
+++ b/skwissh/generic_views.py
@@ -20,12 +20,8 @@ def get_success_url(self):
 
     def get_context_data(self, **kwargs):
         context = super(AddServerView, self).get_context_data(**kwargs)
-        ServerGroupFormSet = modelformset_factory(ServerGroup, form=ServerGroupForm)
+        context.update(get_server_list_context_data())
         context['server_form'] = context['form']
-        context['server_group_form'] = ServerGroupForm()
-        context['server_group_formset'] = ServerGroupFormSet(queryset=ServerGroup.objects.all().select_related())
-        context['groups'] = ServerGroup.objects.all().order_by('name')
-        context['nogroup_servers'] = Server.objects.filter(servergroup__isnull=True).order_by('hostname')
         return context
 
 
@@ -55,12 +51,8 @@ def get_success_url(self):
 
     def get_context_data(self, **kwargs):
         context = super(AddServerGroupView, self).get_context_data(**kwargs)
-        ServerGroupFormSet = modelformset_factory(ServerGroup, form=ServerGroupForm)
-        context['server_form'] = ServerForm()
+        context.update(get_server_list_context_data())
         context['server_group_form'] = context['form']
-        context['server_group_formset'] = ServerGroupFormSet(queryset=ServerGroup.objects.all().select_related())
-        context['groups'] = ServerGroup.objects.all().order_by('name')
-        context['nogroup_servers'] = Server.objects.filter(servergroup__isnull=True).order_by('hostname')
         return context
 
 
@@ -72,11 +64,8 @@ class UpdateServerGroupView(ModelFormSetView):
 
     def get_context_data(self, **kwargs):
         context = super(UpdateServerGroupView, self).get_context_data(**kwargs)
-        context['server_form'] = ServerForm()
-        context['server_group_form'] = ServerGroupForm()
+        context.update(get_server_list_context_data())
         context['server_group_formset'] = context['formset']
-        context['groups'] = ServerGroup.objects.all().order_by('name')
-        context['nogroup_servers'] = Server.objects.filter(servergroup__isnull=True).order_by('hostname')
         return context
 
 
@@ -100,12 +89,8 @@ def get_success_url(self):
 
     def get_context_data(self, **kwargs):
         context = super(AddProbeView, self).get_context_data(**kwargs)
-        ProbeFormSet = modelformset_factory(Probe, form=ProbeForm)
+        context.update(get_probe_list_context_data())
         context['probe_form'] = context['form']
-        context['probe_formset'] = ProbeFormSet(queryset=Probe.objects.all().select_related())
-        context['probes'] = Probe.objects.all()
-        context['groups'] = ServerGroup.objects.all().order_by('name')
-        context['nogroup_servers'] = Server.objects.filter(servergroup__isnull=True).order_by('hostname')
         return context
 
 
@@ -117,11 +102,8 @@ class UpdateProbeView(ModelFormSetView):
 
     def get_context_data(self, **kwargs):
         context = super(UpdateProbeView, self).get_context_data(**kwargs)
-        context['probe_form'] = ProbeForm()
+        context.update(get_probe_list_context_data())
         context['probe_formset'] = context['formset']
-        context['probes'] = Probe.objects.all()
-        context['groups'] = ServerGroup.objects.all().order_by('name')
-        context['nogroup_servers'] = Server.objects.filter(servergroup__isnull=True).order_by('hostname')
         return context
 
 
@@ -130,3 +112,28 @@ class DeleteProbeView(DeleteView):
 
     def get_success_url(self):
         return reverse_lazy('probe-list')
+
+
+#------------------------------------------------------------------------------
+# Context data
+#------------------------------------------------------------------------------
+def get_server_list_context_data():
+    ServerGroupFormSet = modelformset_factory(ServerGroup, form=ServerGroupForm)
+    return {
+            'server_form': ServerForm(),
+            'server_group_form': ServerGroupForm(),
+            'server_group_formset': ServerGroupFormSet(queryset=ServerGroup.objects.all().select_related()),
+            'groups': ServerGroup.objects.all().order_by('name'),
+            'nogroup_servers': Server.objects.filter(servergroup__isnull=True).order_by('hostname'),
+    }
+
+
+def get_probe_list_context_data():
+    ProbeFormSet = modelformset_factory(Probe, form=ProbeForm)
+    return {
+            'probe_form': ProbeForm(),
+            'probe_formset': ProbeFormSet(queryset=Probe.objects.all().select_related()),
+            'probes': Probe.objects.all(),
+            'groups': ServerGroup.objects.all().order_by('name'),
+            'nogroup_servers': Server.objects.filter(servergroup__isnull=True).order_by('hostname')
+    }
diff --git a/skwissh/locale/en/LC_MESSAGES/django.mo b/skwissh/locale/en/LC_MESSAGES/django.mo
index 6f4c328..dc70218 100644
Binary files a/skwissh/locale/en/LC_MESSAGES/django.mo and b/skwissh/locale/en/LC_MESSAGES/django.mo differ
diff --git a/skwissh/locale/en/LC_MESSAGES/django.po b/skwissh/locale/en/LC_MESSAGES/django.po
index 7137cfe..69b0938 100644
--- a/skwissh/locale/en/LC_MESSAGES/django.po
+++ b/skwissh/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Skwissh-0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-05 23:06+0200\n"
+"POT-Creation-Date: 2012-09-08 14:18+0200\n"
 "PO-Revision-Date: 2012-08-12 10:35+0200\n"
 "Last-Translator: Roland SAIKALI <roland@saikali.fr>\n"
 "Language-Team: Roland SAIKALI <roland@saikali.fr>\n"
@@ -17,23 +17,30 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: forms.py:10 models.py:31 templates/section-probe.html:46
+#: forms.py:10
+#: models.py:31
+#: templates/section-probe.html:46
 msgid "Utilise 'sudo' ?"
 msgstr "Use 'sudo' ?"
 
-#: forms.py:10 templates/modal-delete-probe.html:21
+#: forms.py:10
+#: templates/modal-delete-probe.html:21
 #: templates/modal-delete-server-group.html:18
-#: templates/modal-delete-server.html:21 templates/section-probe.html:50
+#: templates/modal-delete-server.html:21
+#: templates/section-probe.html:50
 msgid "Oui"
 msgstr "Yes"
 
-#: forms.py:10 templates/modal-delete-probe.html:22
+#: forms.py:10
+#: templates/modal-delete-probe.html:22
 #: templates/modal-delete-server-group.html:19
-#: templates/modal-delete-server.html:22 templates/section-probe.html:52
+#: templates/modal-delete-server.html:22
+#: templates/section-probe.html:52
 msgid "Non"
 msgstr "No"
 
-#: forms.py:18 templates/index.html:27
+#: forms.py:18
+#: templates/index.html:27
 msgid "Mot de passe"
 msgstr "Password"
 
@@ -45,11 +52,17 @@ msgstr "Name"
 msgid "Options jqPlot"
 msgstr "jqPlot options"
 
-#: models.py:11 models.py:36 models.py:57 models.py:75
+#: models.py:11
+#: models.py:36
+#: models.py:57
+#: models.py:75
 msgid "Date de création"
 msgstr "Creation date"
 
-#: models.py:12 models.py:37 models.py:58 models.py:76
+#: models.py:12
+#: models.py:37
+#: models.py:58
+#: models.py:76
 msgid "Date de modification"
 msgstr "Modification date"
 
@@ -61,7 +74,8 @@ msgstr "Sensor name"
 msgid "Infos complémentaires (version linux...)"
 msgstr "Additional information (linux version...)"
 
-#: models.py:30 templates/section-probe.html:38
+#: models.py:30
+#: templates/section-probe.html:38
 msgid "Commande SSH"
 msgstr "SSH command"
 
@@ -105,7 +119,8 @@ msgstr "SSH username"
 msgid "Mot de passe SSH"
 msgstr "SSH password"
 
-#: models.py:59 templates/base/navigation.html:61
+#: models.py:59
+#: templates/base/navigation.html:61
 msgid "Sondes"
 msgstr "Sensors"
 
@@ -117,20 +132,35 @@ msgstr "Group name"
 msgid "Serveurs"
 msgstr "Servers"
 
-#: models.py:89 models.py:104 models.py:119 models.py:134 models.py:149
+#: models.py:89
+#: models.py:104
+#: models.py:119
+#: models.py:134
+#: models.py:149
 msgid "Date et heure"
 msgstr "Date & Time"
 
-#: models.py:90 models.py:105 models.py:120 models.py:135 models.py:150
-#: models.py:151 templates/cronlog_list.html:32
+#: models.py:90
+#: models.py:105
+#: models.py:120
+#: models.py:135
+#: models.py:150
+#: models.py:151
+#: templates/cronlog_list.html:32
 msgid "Serveur"
 msgstr "Server"
 
-#: models.py:91 models.py:106 models.py:121 models.py:136
+#: models.py:91
+#: models.py:106
+#: models.py:121
+#: models.py:136
 msgid "Sonde"
 msgstr "Sensor"
 
-#: models.py:92 models.py:107 models.py:122 models.py:137
+#: models.py:92
+#: models.py:107
+#: models.py:122
+#: models.py:137
 msgid "Valeur mesurée"
 msgstr "Sensor value"
 
@@ -158,8 +188,7 @@ msgstr "The page you're trying to access doesn't exist."
 msgid ""
 "Si un lien du site vous a mené à cette page, merci de nous contacter afin de "
 "corriger cette erreur."
-msgstr ""
-"If you arrived here through normal application navigation, please contact us "
+msgstr "If you arrived here through normal application navigation, please contact us "
 "so we can try to fix the problem."
 
 #: templates/500.html:8
@@ -170,19 +199,18 @@ msgstr "500 Error - Internal server error"
 msgid ""
 "Une erreur interne du serveur est survenue alors que vous tentiez d'accéder "
 "à une fonctionnalité."
-msgstr ""
-"An internal server error occured while you were trying to access a "
+msgstr "An internal server error occured while you were trying to access a "
 "functionality."
 
 #: templates/500.html:21
 msgid ""
 "Si cette erreur se reproduit, merci de nous contacter afin que nous "
 "puissions la corriger."
-msgstr ""
-"If this error happens again, please contact us so we could try to fix the "
+msgstr "If this error happens again, please contact us so we could try to fix the "
 "problem."
 
-#: templates/cronlog_list.html:9 templates/base/navigation.html:68
+#: templates/cronlog_list.html:9
+#: templates/base/navigation.html:68
 msgid "Rapport des sondes"
 msgstr "Sensors report"
 
@@ -218,7 +246,8 @@ msgstr "Error"
 msgid "Voir les détails..."
 msgstr "See details..."
 
-#: templates/index.html:11 templates/base/navigation.html:112
+#: templates/index.html:11
+#: templates/base/navigation.html:116
 msgid "Connexion"
 msgstr "Connexion"
 
@@ -234,61 +263,70 @@ msgstr "On this demo site, you can connect with credentials"
 msgid "Nom d'utilisateur"
 msgstr "Username"
 
-#: templates/index.html:29 templates/base/navigation.html:121
+#: templates/index.html:29
+#: templates/base/navigation.html:125
 msgid "Se connecter"
 msgstr "Login"
 
-#: templates/index.html:66
+#: templates/index.html:64
 msgid "Skwissh en action"
 msgstr "Skwissh in action"
 
-#: templates/index.html:89
+#: templates/index.html:87
 msgid "Qu'est ce que Skwissh ?"
 msgstr "What is Skwissh ?"
 
-#: templates/index.html:94
+#: templates/index.html:92
 msgid ""
 "Skwissh est une application Django pour monitorer vos serveurs à distance en "
 "utilisant du SSH."
-msgstr ""
-"Skwissh is a Django application for remotely monitoring servers using SSH."
+msgstr "Skwissh is a Django application for remotely monitoring servers using SSH."
 
-#: templates/index.html:97
+#: templates/index.html:95
 msgid ""
 "En arrière plan, Skwissh utilise Python Fabric (http://fabfile.org) pour "
 "exécuter des commandes SSH, récupérer leurs sorties et historiser les "
 "résultats. Les mesures sont prises toutes les minutes."
-msgstr ""
-"In background (crontabed jobs) Skwissh uses Python Fabric (http://fabfile."
+msgstr "In background (crontabed jobs) Skwissh uses Python Fabric (http://fabfile."
 "org) to execute SSH commands, aka. \"sensors\", get the output and store "
 "timestamped values. Measures are taken every minute."
 
-#: templates/index.html:100
+#: templates/index.html:98
 msgid ""
 "Côté application web, Skwissh permet de présenter toutes les historiques des "
 "mesures sous différentes formes (graphiques en ligne, histogrammes, "
 "camemberts, sorties textuelles)."
-msgstr ""
-"On the web application side, Skwissh is able to display nice charts "
+msgstr "On the web application side, Skwissh is able to display nice charts "
 "(linechart, barchart, piechart or simple text) with aggregated measures."
 
-#: templates/index.html:103
-msgid "Vous pouvez également ajouter vos propres sondes personnalisées"
-msgstr "You can also easily add your own custom sensors"
+#: templates/index.html:101
+msgid ""
+"Plusieurs sondes sont fournies avec Skwissh (testées sous Ubuntu 12.04) : "
+"CPU, Swap, WaitIO, mémoire, réseau..."
+msgstr "Many sensors are available 'out of the box' (tested under Ubuntu 12.04) : CPU, Swap, WaitIO, memory, network..."
+
+#: templates/index.html:104
+msgid "Mais vous pouvez également ajouter vos propres sondes personnalisées"
+msgstr "But you can also easily add your own custom sensors"
 
-#: templates/modal-add-probe.html:5 templates/base/navigation.html:87
+#: templates/modal-add-probe.html:5
+#: templates/base/navigation.html:87
 msgid "Ajouter une sonde"
 msgstr "Add a sensor"
 
-#: templates/modal-add-probe.html:12 templates/modal-add-server-group.html:12
-#: templates/modal-add-server.html:12 templates/modal-edit-server.html:12
+#: templates/modal-add-probe.html:12
+#: templates/modal-add-server-group.html:12
+#: templates/modal-add-server.html:12
+#: templates/modal-edit-server.html:12
 #: templates/modal-update-probe.html:16
 #: templates/modal-update-server-group.html:14
 msgid "Sauvegarder"
 msgstr "Save"
 
-#: templates/modal-add-probe.html:13 templates/modal-add-server-group.html:13
-#: templates/modal-add-server.html:13 templates/modal-edit-server.html:13
+#: templates/modal-add-probe.html:13
+#: templates/modal-add-server-group.html:13
+#: templates/modal-add-server.html:13
+#: templates/modal-edit-server.html:13
 #: templates/modal-update-probe.html:17
 #: templates/modal-update-server-group.html:15
 msgid "Annuler"
@@ -313,12 +351,14 @@ msgid ""
 "mesures associées."
 msgstr "Deleting this sensor will automatically purge all associated measures."
 
-#: templates/modal-delete-probe.html:14 templates/modal-delete-server.html:13
+#: templates/modal-delete-probe.html:14
+#: templates/modal-delete-server.html:13
 #, python-format
 msgid "%(count)s mesures seront définitivement perdues."
 msgstr "%(count)s measures will be definitely lost."
 
-#: templates/modal-delete-probe.html:15 templates/modal-delete-server.html:14
+#: templates/modal-delete-probe.html:15
+#: templates/modal-delete-server.html:14
 msgid "Cette opération est irréversible."
 msgstr "This operation is irreversible."
 
@@ -404,7 +444,8 @@ msgstr "Download chart image..."
 msgid "Chargement des données en cours..."
 msgstr "Loading data..."
 
-#: templates/section-group.html:6 templates/base/navigation.html:22
+#: templates/section-group.html:6
+#: templates/base/navigation.html:22
 msgid "Non classé"
 msgstr "Uncategorized"
 
@@ -412,7 +453,8 @@ msgstr "Uncategorized"
 msgid "Editer ce groupe de serveurs"
 msgstr "Edit this server group"
 
-#: templates/section-group.html:15 templates/section-probe.html:9
+#: templates/section-group.html:15
+#: templates/section-probe.html:9
 msgid "Editer"
 msgstr "Edit"
 
@@ -420,7 +462,8 @@ msgstr "Edit"
 msgid "Supprimer ce groupe de serveurs"
 msgstr "Delete this server group"
 
-#: templates/section-group.html:18 templates/section-probe.html:10
+#: templates/section-group.html:18
+#: templates/section-probe.html:10
 msgid "Supprimer"
 msgstr "Delete"
 
@@ -491,10 +534,9 @@ msgstr "No server found"
 #: templates/server-list.html:35
 msgid ""
 "Veuillez ajouter un serveur via le menu 'Options' puis 'Ajouter un serveur'."
-msgstr ""
-"Please add a server by selecting 'Options' menu and then 'Add a server'."
+msgstr "Please add a server by selecting 'Options' menu and then 'Add a server'."
 
-#: templates/base/footer.html:12
+#: templates/base/footer.html:14
 msgid "Développé par"
 msgstr "Developed by"
 
@@ -513,7 +555,8 @@ msgid_plural "%(nb)s sondes disponibles"
 msgstr[0] "%(nb)s available sensor"
 msgstr[1] "%(nb)s available sensors"
 
-#: templates/base/navigation.html:44 templates/base/navigation.html.py:46
+#: templates/base/navigation.html:44
+#: templates/base/navigation.html.py:46
 msgid "mesures"
 msgstr "measures"
 
@@ -557,14 +600,15 @@ msgstr "Edit this server"
 msgid "Langue"
 msgstr "Language"
 
-#: templates/base/navigation.html:117
+#: templates/base/navigation.html:121
 msgid "Se déconnecter de Skwissh"
 msgstr "Logout from Skwissh"
 
-#: templates/base/navigation.html:117
+#: templates/base/navigation.html:121
 msgid "Se déconnecter"
 msgstr "Logout"
 
-#: templates/base/navigation.html:121
+#: templates/base/navigation.html:125
 msgid "Se connecter de Skwissh"
 msgstr "Login to Skwissh"
+
diff --git a/skwissh/locale/fr/LC_MESSAGES/django.mo b/skwissh/locale/fr/LC_MESSAGES/django.mo
index 2780db4..f2c23e4 100644
Binary files a/skwissh/locale/fr/LC_MESSAGES/django.mo and b/skwissh/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/skwissh/locale/fr/LC_MESSAGES/django.po b/skwissh/locale/fr/LC_MESSAGES/django.po
index 473a3bd..e0c7c88 100644
--- a/skwissh/locale/fr/LC_MESSAGES/django.po
+++ b/skwissh/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-05 23:06+0200\n"
+"POT-Creation-Date: 2012-09-08 14:18+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -213,7 +213,7 @@ msgstr ""
 msgid "Voir les détails..."
 msgstr ""
 
-#: templates/index.html:11 templates/base/navigation.html:112
+#: templates/index.html:11 templates/base/navigation.html:116
 msgid "Connexion"
 msgstr ""
 
@@ -229,40 +229,46 @@ msgstr ""
 msgid "Nom d'utilisateur"
 msgstr ""
 
-#: templates/index.html:29 templates/base/navigation.html:121
+#: templates/index.html:29 templates/base/navigation.html:125
 msgid "Se connecter"
 msgstr ""
 
-#: templates/index.html:66
+#: templates/index.html:64
 msgid "Skwissh en action"
 msgstr ""
 
-#: templates/index.html:89
+#: templates/index.html:87
 msgid "Qu'est ce que Skwissh ?"
 msgstr ""
 
-#: templates/index.html:94
+#: templates/index.html:92
 msgid ""
 "Skwissh est une application Django pour monitorer vos serveurs à distance en "
 "utilisant du SSH."
 msgstr ""
 
-#: templates/index.html:97
+#: templates/index.html:95
 msgid ""
 "En arrière plan, Skwissh utilise Python Fabric (http://fabfile.org) pour "
 "exécuter des commandes SSH, récupérer leurs sorties et historiser les "
 "résultats. Les mesures sont prises toutes les minutes."
 msgstr ""
 
-#: templates/index.html:100
+#: templates/index.html:98
 msgid ""
 "Côté application web, Skwissh permet de présenter toutes les historiques des "
 "mesures sous différentes formes (graphiques en ligne, histogrammes, "
 "camemberts, sorties textuelles)."
 msgstr ""
 
-#: templates/index.html:103
-msgid "Vous pouvez également ajouter vos propres sondes personnalisées"
+#: templates/index.html:101
+msgid ""
+"Plusieurs sondes sont fournies avec Skwissh (testées sous Ubuntu 12.04) : "
+"CPU, Swap, WaitIO, mémoire, réseau..."
+msgstr ""
+
+#: templates/index.html:104
+msgid "Mais vous pouvez également ajouter vos propres sondes personnalisées"
 msgstr ""
 
 #: templates/modal-add-probe.html:5 templates/base/navigation.html:87
@@ -482,7 +488,7 @@ msgid ""
 "Veuillez ajouter un serveur via le menu 'Options' puis 'Ajouter un serveur'."
 msgstr ""
 
-#: templates/base/footer.html:12
+#: templates/base/footer.html:14
 msgid "Développé par"
 msgstr ""
 
@@ -545,14 +551,14 @@ msgstr ""
 msgid "Langue"
 msgstr ""
 
-#: templates/base/navigation.html:117
+#: templates/base/navigation.html:121
 msgid "Se déconnecter de Skwissh"
 msgstr ""
 
-#: templates/base/navigation.html:117
+#: templates/base/navigation.html:121
 msgid "Se déconnecter"
 msgstr ""
 
-#: templates/base/navigation.html:121
+#: templates/base/navigation.html:125
 msgid "Se connecter de Skwissh"
 msgstr ""
diff --git a/skwissh/static/skwissh/javascripts/app.js b/skwissh/static/skwissh/javascripts/app.js
index 2939de3..5f71b4c 100644
--- a/skwissh/static/skwissh/javascripts/app.js
+++ b/skwissh/static/skwissh/javascripts/app.js
@@ -1,22 +1,15 @@
-(function ($) {  
-
-  $(function(){
-    $(document).foundationAlerts();
-    $(document).foundationButtons();
-    $(document).foundationAccordion();
-    $(document).foundationNavigation();
-    $(document).foundationCustomForms();
-    //$(document).foundationMediaQueryViewer();
-    $(document).foundationTabs({callback:$.foundation.customForms.appendCustomMarkup});
-    
-    $(document).tooltips();
-    $('input, textarea').placeholder();
-    
-    // UNCOMMENT THE LINE YOU WANT BELOW IF YOU WANT IE8 SUPPORT AND ARE USING .block-grids
-    // $('.block-grid.two-up>li:nth-child(2n+1)').css({clear: 'both'});
-    // $('.block-grid.three-up>li:nth-child(3n+1)').css({clear: 'both'});
-    // $('.block-grid.four-up>li:nth-child(4n+1)').css({clear: 'both'});
-    // $('.block-grid.five-up>li:nth-child(5n+1)').css({clear: 'both'});
-  });
-  
+(function($) {
+	$(function() {
+		$(document).foundationAlerts();
+		$(document).foundationButtons();
+		$(document).foundationAccordion();
+		$(document).foundationNavigation();
+		$(document).foundationCustomForms();
+		$(document).foundationTabs({
+			callback : $.foundation.customForms.appendCustomMarkup
+		});
+		$(document).tooltips();
+		$('input, textarea').placeholder();
+	});
 })(jQuery);
+
diff --git a/skwissh/static/skwissh/javascripts/plots.js b/skwissh/static/skwissh/javascripts/plots.js
new file mode 100644
index 0000000..7cf518e
--- /dev/null
+++ b/skwissh/static/skwissh/javascripts/plots.js
@@ -0,0 +1,251 @@
+function refreshGraph(url, period, graphtype, probe_id, display_name, labels, units, element) {
+	if ( typeof element != "undefined") {
+		element.parents("ul.nav-bar").children("li").removeClass("active");
+		element.parents("li").addClass("active");
+	}
+	$("#graph-" + probe_id).empty();
+	$("#graph-" + probe_id).css('height', 'auto');
+	$("#detail-" + probe_id + " .waiting, #detail-" + probe_id + " .waiting-title").show();
+	$.ajax({
+		async : true,
+		url : url,
+		dataType : "json",
+		success : function(mesures) {
+			if (mesures.length === 0) {
+				showError("No data found for sensor \'" + display_name + "\'.", probe_id);
+			}
+			updateGraph(mesures, graphtype, probe_id, labels, units, period);
+		},
+		error : function(mesures) {
+			showError("An error occured while building sensor graph \'" + display_name + "\'.", probe_id);
+		}
+	});
+};
+function updateGraph(mesures, graphtype, probe_id, labels, units, period) {
+	var mesure_value = mesures[0].fields.value;
+	if (graphtype === "text") {
+		var html = "<textarea disabled class='text-output'>" + mesure_value + "</textarea>";
+		$("#detail-" + probe_id + " .waiting, #detail-" + probe_id + " .waiting-title").hide();
+		$("#graph-" + probe_id).html(html);
+		return;
+	} else {
+		var graph_options = jQuery.extend(true, {}, graphtypes[graphtype]);;
+		if (labels.length != 0) {
+			str_labels = labels.split(";");
+			for (var i = 0; i < str_labels.length; i++) {
+				if ( typeof graph_options.series === "undefined")
+					graph_options.series = new Array();
+				graph_options.series.push({
+					label : str_labels[i]
+				});
+			}
+			graph_options.legend = {
+				show : true,
+				location : 'w',
+				placement : 'inside'
+			};
+		}
+		$("#section-" + probe_id + " .display").show();
+		if (period === 'last') {
+			$("#section-" + probe_id + " .display").hide();
+			var mesures_list = mesure_value.split(";");
+			var html = "<h4 class='single-mesure'>";
+			for (var i = 0, j = mesures_list.length; i < j; i++) {
+				var value = mesures_list[i];
+				if (i != 0)
+					html = html + " / ";
+				if (value == "")
+					value = "0";
+				html = html + value + " " + units;
+			}
+			html = html + "</h4>";
+			$("#detail-" + probe_id + " .waiting, #detail-" + probe_id + " .waiting-title").hide();
+			$("#graph-" + probe_id).html(html);
+			return;
+		}
+		var graph_data = new Array();
+		if (graphtype.indexOf("graph") != -1) {
+			var nb_values = mesures[0].fields.value.split(";").length;
+			$("#summary-" + probe_id).empty();
+			for (var i = 0; i < nb_values; i++) {
+				var just_values = new Array();
+				if ( typeof graph_data[i] === "undefined")
+					graph_data[i] = new Array();
+				for (var k = 0, j = mesures.length; k < j; k++) {
+					var mesure = mesures[k];
+					var mesure_date = $.jsDate.strftime(new $.jsDate(new Date(mesure.fields.timestamp)), "%Y-%m-%d %H:%M:%S");
+					var mesure_value = parseFloat(mesure.fields.value.split(";")[i]);
+					if (isNaN(mesure_value))
+						mesure_value = 0;
+					graph_data[i].push([mesure_date, mesure_value]);
+					just_values.push(mesure_value);
+				}
+				var minValue = roundNumber(Math.min.apply(Math, just_values), 2);
+				var maxValue = roundNumber(Math.max.apply(Math, just_values), 2);
+				var avg = roundNumber(average(just_values), 2);
+				var unit = " " + units;
+				$("#summary-" + probe_id).append("<div class='display'>")
+				$("#summary-" + probe_id).append("<div class='two columns border'><span id='min-" + probe_id + "'>" + labels.split(';')[i] + "</span></div>");
+				$("#summary-" + probe_id).append("<div class='two columns border'>Min : <span id='min-" + probe_id + "'>" + minValue + unit + "</span></div>");
+				$("#summary-" + probe_id).append("<div class='two columns border'>Max : <span id='max-" + probe_id + "'>" + maxValue + unit + "</span></div>");
+				$("#summary-" + probe_id).append("<div class='two columns border'>Avg : <span id='avg-" + probe_id + "'>" + avg + unit + "</span></div>");
+				$("#summary-" + probe_id).append("<div class='two columns border'>Last : <span id='last-" + probe_id + "'>" + just_values[0] + unit + "</span></div>");
+				$("#summary-" + probe_id).append("<div class='two columns'></div>");
+				$("#summary-" + probe_id).append("</div>")
+			}
+			for (var i = 0; i < graph_data.length; i++) {
+				var data = graph_data[i];
+				var desired_start_date = new $.jsDate(new Date()).add(-1, period).add(1, 'minute');
+				desired_start_date = desired_start_date.add(-desired_start_date.getSeconds(), 'seconds');
+				var effective_start_date = new $.jsDate(data[data.length -1][0]);
+				var fake_values = []
+				while (desired_start_date.getUnix() < effective_start_date.getUnix()) {
+					if (period == "hour")
+						desired_start_date = new $.jsDate(desired_start_date).add(1, 'minute')
+					else if (period == "day")
+						desired_start_date = new $.jsDate(desired_start_date).add(10, 'minute')
+					else if (period == "week")
+						desired_start_date = new $.jsDate(desired_start_date).add(1, 'hour')
+					else if (period == "month")
+						desired_start_date = new $.jsDate(desired_start_date).add(3, 'hour')
+
+					fake_values.push([$.jsDate.strftime(desired_start_date.getTime(), "%Y-%m-%d %H:%M:%S"), 0])
+				}
+				graph_data[i] = graph_data[i].concat(reverseArray(fake_values, false));
+			};
+			var maxDate = graph_data[0][0][0];
+			var minDate = graph_data[0][graph_data[0].length-1][0];
+			var bMgin = 1;
+			if (period === 'hour') {
+				var tickInt = '5 minutes';
+				bMgin = 2;
+			} else if (period === 'day')
+				var tickInt = '2 hours';
+			else if (period === 'week')
+				var tickInt = '1 days';
+			else if (period === 'month')
+				var tickInt = '3 days';
+
+			graph_options.axes.yaxis.tickOptions.formatString = graph_options.axes.yaxis.tickOptions.formatString.replace("@UNITS@", units);
+			graph_options.axes.xaxis.min = minDate;
+			graph_options.axes.xaxis.max = maxDate;
+			graph_options.axes.xaxis.tickInterval = tickInt;
+			if ( typeof graph_options.seriesDefaults.rendererOptions === "undefined")
+				graph_options.seriesDefaults.rendererOptions = new Object();
+			graph_options.seriesDefaults.rendererOptions.barMargin = bMgin;
+		} else if (graphtype == "pie") {
+			var lbls = labels.split(';')
+			var data = mesures[0].fields.value.split(';');
+			var tmp_data = new Array();
+			for (var i = 0; i < data.length; i++) {
+				mesure_value = parseInt(data[i]);
+				if (isNaN(mesure_value))
+					mesure_value = 0;
+				tmp_data.push([lbls[i], mesure_value]);
+			}
+			graph_data.push(tmp_data);
+		}
+		$("#detail-" + probe_id + " .waiting, #detail-" + probe_id + " .waiting-title").hide();
+		plots[probe_id] = $.jqplot('graph-' + probe_id, graph_data, graph_options);
+	}
+};
+function average(l) {
+	var items = l.length;
+	var sum = 0;
+	for ( i = 0; i < items; i++)
+		sum += l[i];
+	return (sum / items);
+};
+function roundNumber(rnum, rlength) {
+	return parseFloat(Math.round(rnum * Math.pow(10, rlength)) / Math.pow(10, rlength));
+};
+function reverseArray(array, preserve_keys) {
+	var isArray = Object.prototype.toString.call(array) === "[object Array]", tmp_arr = preserve_keys ? {} : [], key;
+	if (isArray && !preserve_keys)
+		return array.slice(0).reverse();
+	if (preserve_keys) {
+		var keys = [];
+		for (key in array)
+		keys.push(key);
+		var i = keys.length;
+		while (i--)
+		tmp_arr[keys[i]] = array[keys[i]];
+	} else
+		for (key in array)
+		tmp_arr.unshift(array[key]);
+	return tmp_arr;
+};
+function jqplotToImg(obj) {
+	var newCanvas = document.createElement("canvas");
+	newCanvas.width = obj.find("canvas.jqplot-base-canvas").width();
+	newCanvas.height = obj.find("canvas.jqplot-base-canvas").height() + 10;
+	var baseOffset = obj.find("canvas.jqplot-base-canvas").offset();
+	var context = newCanvas.getContext("2d");
+	context.fillStyle = "rgba(255,255,255,1)";
+	context.fillRect(0, 0, newCanvas.width, newCanvas.height);
+	obj.children().each(function() {
+		if ($(this)[0].tagName.toLowerCase() == 'div') {
+			$(this).children("canvas").each(function() {
+				var offset = $(this).offset();
+				newCanvas.getContext("2d").drawImage(this, offset.left - baseOffset.left, offset.top - baseOffset.top);
+			});
+			$(this).children("div").each(function() {
+				var offset = $(this).offset();
+				var context = newCanvas.getContext("2d");
+				context.font = $(this).css('font-style') + " " + $(this).css('font-size') + " " + $(this).css('font-family');
+				context.fillStyle = $(this).css('color');
+				context.fillText($(this).text(), offset.left - baseOffset.left, offset.top - baseOffset.top + $(this).height());
+			});
+		} else if ($  (this)[0].tagName.toLowerCase() == 'canvas') {
+			var offset = $(this).offset();
+			newCanvas.getContext("2d").drawImage(this, offset.left - baseOffset.left, offset.top - baseOffset.top);
+		}
+	});
+	obj.children(".jqplot-point-label").each(function() {
+		var offset = $(this).offset();
+		var context = newCanvas.getContext("2d");
+		context.font = $(this).css('font-style') + " " + $(this).css('font-size') + " " + $(this).css('font-family');
+		context.fillStyle = $(this).css('color');
+		context.fillText($(this).text(), offset.left - baseOffset.left, offset.top - baseOffset.top + $(this).height() * 3 / 4);
+	});
+	obj.children("div.jqplot-title").each(function() {
+		var offset = $(this).offset();
+		var context = newCanvas.getContext("2d");
+		context.font = $(this).css('font-style') + " " + $(this).css('font-size') + " " + $(this).css('font-family');
+		context.textAlign = $(this).css('text-align');
+		context.fillStyle = $(this).css('color');
+		context.fillText($(this).text(), newCanvas.width / 2, offset.top - baseOffset.top + $(this).height());
+	});
+	obj.children("table.jqplot-table-legend").each(function() {
+		var offset = $(this).offset();
+		var context = newCanvas.getContext("2d");
+		context.strokeStyle = $(this).css('border-top-color');
+		context.strokeRect(offset.left - baseOffset.left, offset.top - baseOffset.top, $(this).width(), $(this).height());
+		context.fillStyle = $(this).css('background-color');
+		context.fillRect(offset.left - baseOffset.left, offset.top - baseOffset.top, $(this).width(), $(this).height());
+	});
+	obj.find("div.jqplot-table-legend-swatch").each(function() {
+		var offset = $(this).offset();
+		var context = newCanvas.getContext("2d");
+		context.fillStyle = $(this).css('background-color');
+		context.fillRect(offset.left - baseOffset.left, offset.top - baseOffset.top, $(this).parent().width(), $(this).parent().height());
+	});
+	obj.find("td.jqplot-table-legend").each(function() {
+		var offset = $(this).offset();
+		var context = newCanvas.getContext("2d");
+		context.font = $(this).css('font-style') + " " + $(this).css('font-size') + " " + $(this).css('font-family');
+		context.fillStyle = $(this).css('color');
+		context.textAlign = $(this).css('text-align');
+		context.textBaseline = $(this).css('vertical-align');
+		context.fillText($(this).text(), offset.left - baseOffset.left, offset.top - baseOffset.top + $(this).height() / 2 + parseInt($(this).css('padding-top').replace('px', '')));
+	});
+	return newCanvas.toDataURL("image/png");
+};
+function showError(message, probe_id) {
+	$("#detail-" + probe_id + " .waiting, #detail-" + probe_id + " .waiting-title").hide();
+	$("#graph-" + probe_id).html('<div class="alert-box alert">' + message + '</div>');
+};
+$(window).resize(function() {
+	for (id in plots)
+		plots[id].replot({ resetAxes: false });
+});
\ No newline at end of file
diff --git a/skwissh/templates/index.html b/skwissh/templates/index.html
index 92ef47d..63dba77 100644
--- a/skwissh/templates/index.html
+++ b/skwissh/templates/index.html
@@ -98,7 +98,10 @@
 					{% trans "Côté application web, Skwissh permet de présenter toutes les historiques des mesures sous différentes formes (graphiques en ligne, histogrammes, camemberts, sorties textuelles)." %}
 				</p>
 				<p>
-					{% trans "Vous pouvez également ajouter vos propres sondes personnalisées" %} !
+					{% trans "Plusieurs sondes sont fournies avec Skwissh (testées sous Ubuntu 12.04) : CPU, Swap, WaitIO, mémoire, réseau..." %}
+				</p>
+				<p>
+					{% trans "Mais vous pouvez également ajouter vos propres sondes personnalisées" %} !
 				</p>
 			</div>
 		</section>
diff --git a/skwissh/templates/skwissh_graphs.js b/skwissh/templates/skwissh_graphs.js
index 6e38720..7943f24 100644
--- a/skwissh/templates/skwissh_graphs.js
+++ b/skwissh/templates/skwissh_graphs.js
@@ -1,5 +1,4 @@
 {% load i18n %}
-{% load skwissh_templatetags %}
 <!--[if lt IE 9]><script language="javascript" type="text/javascript" src="http://cdn.jsdelivr.net/jqplot/1.0.2/excanvas.js"></script><![endif]-->
 <script type="text/javascript" src="http://cdn.jsdelivr.net/jqplot/1.0.2/jquery.jqplot.min.js"></script>
 <link rel="stylesheet" type="text/css" href="http://cdn.jsdelivr.net/jqplot/1.0.2/jquery.jqplot.min.css" />
@@ -9,302 +8,24 @@
 <script type="text/javascript" src="http://cdn.jsdelivr.net/jqplot/1.0.2/plugins/jqplot.highlighter.min.js"></script>
 <script type="text/javascript" src="http://cdn.jsdelivr.net/jqplot/1.0.2/plugins/jqplot.cursor.min.js"></script>
 <script type="text/javascript" src="{{ STATIC_URL }}skwissh/javascripts/date.format.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}skwissh/javascripts/plots.js"></script>
 <script type="text/javascript">
+var plots = {}
+var get_mesures_url = "{% url mesures server.id '999' 'period' %}";
+var graphtypes = {}
+{% for graphtype in graphtypes %}
+graphtypes['{{ graphtype.name }}'] = { {{ graphtype.options|safe }} };
+{% endfor %}
 $(document).ready(function() {
 	$.jqplot.config.enablePlugins = true; 	
-    {% for probe in server.probes.all %}
-		refreshGraph_{{ probe.id }}('hour');
-    {% endfor %}
+	{% for probe in server.probes.all %}
+	refreshGraph(get_mesures_url.replace('period', 'hour').replace('999', {{ probe.id }}), 'hour', '{{ probe.graph_type.name }}', {{ probe.id }}, '{{ probe.display_name }}', '{{ probe.probe_labels }}', '{{ probe.probe_unit }}');
+	{% endfor %}
 });
-{% for probe in server.probes.all %}
-	{% ifnotequal probe.graph_type.name 'text' %}
-	$('.period-{{ probe.id }}').click(function(e){
-		e.preventDefault();
-		refreshGraph_{{ probe.id }}($(this).data("period"), $(this));
-	});
-	{% endifnotequal %}
-	function refreshGraph_{{ probe.id }}(period, element) {
-		if (typeof element != "undefined") {
-			element.parents("ul.nav-bar").children("li").removeClass("active");
-			element.parents("li").addClass("active");
-		}
-		$("#graph-{{ probe.id }}").empty();
-		$("#graph-{{ probe.id }}").css('height','auto');
-		$("#detail-{{ probe.id }} .waiting, #detail-{{ probe.id }} .waiting-title").show();
-		$.ajax({
-			async : true,
-			url : "{% url mesures server.id probe.id 'period' %}".replace('period', period),
-			dataType : "json",
-			success : function(mesures) {
-				if (mesures.length === 0) {
-					showError_{{ probe.id }}("{% blocktrans %}Aucune mesure n'a été trouvée pour la sonde{% endblocktrans %} \'{{ probe.display_name }}\'.");
-				}
-				updateGraph_{{ probe.id }}(mesures, period);
-			},
-			error : function(mesures) {
-				showError_{{ probe.id }}("{% blocktrans %}Une erreur s\'est produite lors de la construction du graphique{% endblocktrans %} \'{{ probe.display_name }}\'.");
-			}
-		});
-	};
-	function showError_{{ probe.id }}(message) {
-		$("#detail-{{ probe.id }} .waiting, #detail-{{ probe.id }} .waiting-title").hide();
-		$("#graph-{{ probe.id }}").html('<div class="alert-box alert">' + message + '</div>');
-	};
-	{% ifnotequal probe.graph_type.name 'text' %}
-	var plot_{{ probe.id }} = null;
-	$(window).resize(function() {
-		plot_{{ probe.id }}.replot( { resetAxes: false } );
-	});
-	{% endifnotequal %}
-	function updateGraph_{{ probe.id }}(mesures, period) {
-		var mesure_value = mesures[0].fields.value;
-		{% if probe.graph_type.name == 'text' %}
-		var html = "<textarea disabled class='text-output'>" + mesure_value + "</textarea>";
-		$("#detail-{{ probe.id }} .waiting, #detail-{{ probe.id }} .waiting-title").hide();
-		$("#graph-{{ probe.id }}").html(html);
-		{% else %}
-		$("#section-{{ probe.id }} .display").show();
-		if (period === 'last') {
-			$("#section-{{ probe.id }} .display").hide();
-			var mesures_list = mesure_value.split(";");
-			var html = "<h4 class='single-mesure'>";
-			for(var i=0,j=mesures_list.length; i<j; i++){
-				var value = mesures_list[i];
-				if (i!=0)
-					html = html + " / ";
-				if (value == "")
-					value = "0";			
-				html = html + value + " {{ probe.probe_unit }}";
-			}
-			html = html + "</h4>";
-			$("#detail-{{ probe.id }} .waiting, #detail-{{ probe.id }} .waiting-title").hide();
-			$("#graph-{{ probe.id }}").html(html);
-			return;
-		}
-		var graph_data = new Array();
-		{% if probe.graph_type.name == "linegraph" or probe.graph_type.name == 'bargraph'%}
-		var nb_values = mesures[0].fields.value.split(";").length;
-		var labels = "{{ probe.probe_labels }}";
-		$("#summary-{{ probe.id }}").empty();
-		for(var i = 0; i < nb_values; i++) {
-			var just_values = new Array(); 
-			if (typeof graph_data[i] === "undefined")
-				graph_data[i] = new Array();
-			for(var k = 0, j = mesures.length; k < j; k++) {
-				var mesure = mesures[k];
-				var mesure_date = $.jsDate.strftime(new $.jsDate(new Date(mesure.fields.timestamp)), "%Y-%m-%d %H:%M:%S");
-				var mesure_value = parseFloat(mesure.fields.value.split(";")[i]);
-				if (isNaN(mesure_value))
-					mesure_value = 0;
-				graph_data[i].push([mesure_date, mesure_value]);
-				just_values.push(mesure_value);
-			}
-			var minValue = roundNumber(Math.min.apply(Math, just_values), 2);
-			var maxValue = roundNumber(Math.max.apply(Math, just_values), 2);
-			var avg = roundNumber(average(just_values), 2);
-			var unit = "{% ifnotequal probe.probe_unit "" %} {{ probe.probe_unit }}{% endifnotequal %}";
-			$("#summary-{{ probe.id }}").append("<div class='display'>")
-			$("#summary-{{ probe.id }}").append("<div class='two columns border'><span id='min-{{ probe.id }}'>" + labels.split(';')[i] + "</span></div>");
-			$("#summary-{{ probe.id }}").append("<div class='two columns border'>Min : <span id='min-{{ probe.id }}'>" + minValue + unit + "</span></div>");
-			$("#summary-{{ probe.id }}").append("<div class='two columns border'>Max : <span id='max-{{ probe.id }}'>" + maxValue + unit + "</span></div>");
-			$("#summary-{{ probe.id }}").append("<div class='two columns border'>Avg : <span id='avg-{{ probe.id }}'>" + avg + unit + "</span></div>");
-			$("#summary-{{ probe.id }}").append("<div class='two columns border'>Last : <span id='last-{{ probe.id }}'>" + just_values[0] + unit + "</span></div>");
-			$("#summary-{{ probe.id }}").append("<div class='two columns'></div>");
-			$("#summary-{{ probe.id }}").append("</div>")
-		}
-		for (var i=0; i < graph_data.length; i++) {
-		  var data = graph_data[i];
-		  var desired_start_date = new $.jsDate(new Date()).add(-1, period).add(1, 'minute');
-		  desired_start_date = desired_start_date.add(- desired_start_date.getSeconds(), 'seconds');
-		  var effective_start_date = new $.jsDate(data[data.length -1][0]);
-		  var fake_values = []  
-		  while (desired_start_date.getUnix() < effective_start_date.getUnix()) {
-		  	if (period == "hour")
-		  		desired_start_date = new $.jsDate(desired_start_date).add(1, 'minute')
-		  	else if (period == "day")
-		  		desired_start_date = new $.jsDate(desired_start_date).add(10, 'minute')
-		  	else if (period == "week")
-		  		desired_start_date = new $.jsDate(desired_start_date).add(1, 'hour')
-		  	else if (period == "month")
-		  		desired_start_date = new $.jsDate(desired_start_date).add(3, 'hour')
-		  			  	
-		  	fake_values.push([$.jsDate.strftime(desired_start_date.getTime(), "%Y-%m-%d %H:%M:%S"), 0])
-		  }
-		  graph_data[i] = graph_data[i].concat(reverseArray(fake_values, false));
-		};
-		var maxDate = graph_data[0][0][0];
-		var minDate = graph_data[0][graph_data[0].length-1][0];
-		var bMgin = 1;
-		if (period === 'hour') {
-			var tickInt = '5 minutes';
-			bMgin = 2;	
-		}
-		else if (period === 'day')
-			var tickInt = '2 hours';
-		else if (period === 'week')
-			var tickInt = '1 days';
-		else if (period === 'month')
-			var tickInt = '3 days';
-		{% endif %}
-		{% ifequal probe.graph_type.name "pie" %}
-		var labels = "{{ probe.probe_labels }}".split(';');
-		var data = mesures[0].fields.value.split(';');
-		var tmp_data = new Array();
-		for(var i=0; i<data.length; i++) {
-			mesure_value = parseInt(data[i]);
-			if (isNaN(mesure_value))
-				mesure_value = 0;
-		  	tmp_data.push([labels[i],mesure_value]);
-		}
-		graph_data.push(tmp_data);
-		{% endifequal %}
-		$("#detail-{{ probe.id }} .waiting, #detail-{{ probe.id }} .waiting-title").hide();
-		var graph_options = { {{ probe.graph_type.options|addunits:probe.probe_unit|addlegend:probe.probe_labels|safe }} };
-		plot_{{ probe.id }} = $.jqplot('graph-{{ probe.id }}', graph_data, graph_options);
-		{% endif %}
-	};
-{% endfor %}
-function average(l) {
-	var items = l.length;
-   	var sum = 0;
-   	for (i = 0; i < items;i++)
-      	sum += l[i];
-   	return (sum/items);
-}
-function roundNumber(rnum, rlength) {
-  	return parseFloat(Math.round(rnum*Math.pow(10,rlength))/Math.pow(10,rlength));
-}
-function reverseArray(array, preserve_keys) {
-	var isArray = Object.prototype.toString.call(array) === "[object Array]", tmp_arr = preserve_keys ? {} : [], key;
-    if (isArray && !preserve_keys)
-    	return array.slice(0).reverse();
-    if (preserve_keys) {
-        var keys = [];
-        for (key in array)
-            keys.push(key);
-        var i = keys.length;
-        while (i--) {
-            key = keys[i];
-            tmp_arr[key] = array[key];
-        }
-    } else {
-        for (key in array) {
-            tmp_arr.unshift(array[key]);
-        }
-    }
-    return tmp_arr;
-}
-function jqplotToImg(obj) {
-    var newCanvas = document.createElement("canvas");
-    newCanvas.width = obj.find("canvas.jqplot-base-canvas").width();
-    newCanvas.height = obj.find("canvas.jqplot-base-canvas").height()+10;
-    var baseOffset = obj.find("canvas.jqplot-base-canvas").offset();
-
-    var context = newCanvas.getContext("2d");
-    context.fillStyle = "rgba(255,255,255,1)";
-    context.fillRect(0, 0, newCanvas.width, newCanvas.height);
-
-    obj.children().each(function () {
-        if ($(this)[0].tagName.toLowerCase() == 'div') {
-            $(this).children("canvas").each(function() {
-                var offset = $  (this).offset();
-                newCanvas.getContext("2d").drawImage(this,
-                    offset.left - baseOffset.left,
-                    offset.top - baseOffset.top
-                );
-            });
-            $(this).children("div").each(function() {
-                var offset = $(this).offset();
-                var context = newCanvas.getContext("2d");
-                context.font = $(this).css('font-style') + " " + $(this).css('font-size') + " " + $(this).css('font-family');
-                context.fillStyle = $(this).css('color');
-                context.fillText($(this).text(),
-                    offset.left - baseOffset.left,
-                    offset.top - baseOffset.top + $(this).height()
-                );
-            });
-        } else if($  (this)[0].tagName.toLowerCase() == 'canvas') {
-            // all other canvas from the chart
-            var offset = $  (this).offset();
-            newCanvas.getContext("2d").drawImage(this,
-                offset.left - baseOffset.left,
-                offset.top - baseOffset.top
-            );
-        }
-    });
-
-    // add the point labels
-    obj.children(".jqplot-point-label").each(function() {
-        var offset = $  (this).offset();
-        var context = newCanvas.getContext("2d");
-        context.font = $  (this).css('font-style') + " " + $  (this).css('font-size') + " " + $  (this).css('font-family');
-        context.fillStyle = $  (this).css('color');
-        context.fillText($  (this).text(),
-            offset.left - baseOffset.left,
-            offset.top - baseOffset.top + $  (this).height()*3/4
-        );
-    });
-
-    // add the title
-    obj.children("div.jqplot-title").each(function() {
-        var offset = $  (this).offset();
-        var context = newCanvas.getContext("2d");
-        context.font = $  (this).css('font-style') + " " + $  (this).css('font-size') + " " + $  (this).css('font-family');
-        context.textAlign = $  (this).css('text-align');
-        context.fillStyle = $  (this).css('color');
-        context.fillText($  (this).text(),
-            newCanvas.width / 2,
-            offset.top - baseOffset.top + $  (this).height()
-        );
-    });
-
-    // add the legend
-    obj.children("table.jqplot-table-legend").each(function() {
-        var offset = $  (this).offset();
-        var context = newCanvas.getContext("2d");
-        context.strokeStyle = $  (this).css('border-top-color');
-        context.strokeRect(
-            offset.left - baseOffset.left,
-            offset.top - baseOffset.top,
-            $  (this).width(),$  (this).height()
-        );
-        context.fillStyle = $  (this).css('background-color');
-        context.fillRect(
-            offset.left - baseOffset.left,
-            offset.top - baseOffset.top,
-            $  (this).width(),$  (this).height()
-        );
-    });
-
-    // add the rectangles
-    obj.find("div.jqplot-table-legend-swatch").each(function() {
-        var offset = $  (this).offset();
-        var context = newCanvas.getContext("2d");
-        context.fillStyle = $  (this).css('background-color');
-        context.fillRect(
-            offset.left - baseOffset.left,
-            offset.top - baseOffset.top,
-            $  (this).parent().width(),$  (this).parent().height()
-        );
-    });
-
-    obj.find("td.jqplot-table-legend").each(function() {
-        var offset = $  (this).offset();
-        var context = newCanvas.getContext("2d");
-        context.font = $  (this).css('font-style') + " " + $  (this).css('font-size') + " " + $  (this).css('font-family');
-        context.fillStyle = $  (this).css('color');
-        context.textAlign = $  (this).css('text-align');
-        context.textBaseline = $  (this).css('vertical-align');
-        context.fillText($  (this).text(),
-            offset.left - baseOffset.left,
-            offset.top - baseOffset.top + $  (this).height()/2 + parseInt($  (this).css('padding-top').replace('px',''))
-        );
-    });
-
-    // convert the image to base64 format
-    return newCanvas.toDataURL("image/png");
-}
-
-
-
+{% for probe in server.probes.all %}{% ifnotequal probe.graph_type.name 'text' %}
+$('.period-{{ probe.id }}').click(function(e){
+	e.preventDefault();
+	refreshGraph(get_mesures_url.replace('period', $(this).data("period")).replace('999', {{ probe.id }}), $(this).data("period"), '{{ probe.graph_type.name }}', {{ probe.id }}, '{{ probe.display_name }}', '{{ probe.probe_labels }}', '{{ probe.probe_unit }}', $(this));
+});
+{% endifnotequal %}{% endfor %}	
 </script>
\ No newline at end of file
diff --git a/skwissh/templatetags/skwissh_templatetags.py b/skwissh/templatetags/skwissh_templatetags.py
index 2a89016..4673e2d 100644
--- a/skwissh/templatetags/skwissh_templatetags.py
+++ b/skwissh/templatetags/skwissh_templatetags.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 from django import template
-from django.db.models.aggregates import Max
-from django.utils import timezone
 from fabric.api import env
 from skwissh.models import Measure
 import django
@@ -10,21 +8,6 @@
 register = template.Library()
 
 
-@register.filter(name='addunits')
-def addunits(value, units):
-    return value.replace("@UNITS@", units)
-
-
-@register.filter(name='addlegend')
-def addlegend(value, labels):
-    if labels:
-        legend_options = "series:[ %s ]," % ",".join(["{label: '%s'}" % label for label in labels.split(';')])
-        legend_options += "legend: {show: true, location: 'w', placement: 'inside'}"
-        return value.replace("@SERIES@", legend_options)
-    else:
-        return value.replace("@SERIES@,", "")
-
-
 @register.simple_tag(name='get_skwissh_version')
 def get_skwissh_version():
     return str(skwissh.__version__)
diff --git a/skwissh/views.py b/skwissh/views.py
index 29eb7bd..a8ad6b2 100644
--- a/skwissh/views.py
+++ b/skwissh/views.py
@@ -3,14 +3,15 @@
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.views import login
 from django.core import serializers
-from django.forms.models import modelformset_factory
 from django.http import HttpResponse, Http404, HttpResponseServerError
 from django.shortcuts import render, redirect, get_object_or_404
 from django.utils.timezone import utc
 from django.views.decorators.cache import cache_page
-from skwissh.forms import ServerForm, ServerGroupForm, ProbeForm
+from skwissh.forms import ServerForm
+from skwissh.generic_views import get_server_list_context_data, \
+    get_probe_list_context_data
 from skwissh.models import Server, Measure, ServerGroup, Probe, MeasureDay, \
-    MeasureWeek, MeasureMonth
+    MeasureWeek, MeasureMonth, GraphType
 import datetime
 
 
@@ -28,28 +29,12 @@ def login_skwissh(request):
 
 @login_required
 def server_list(request):
-    ServerGroupFormSet = modelformset_factory(ServerGroup, form=ServerGroupForm)
-    data = {
-            'server_form': ServerForm(),
-            'server_group_form': ServerGroupForm(),
-            'server_group_formset': ServerGroupFormSet(queryset=ServerGroup.objects.all().select_related()),
-            'groups': ServerGroup.objects.all().order_by('name'),
-            'nogroup_servers': Server.objects.filter(servergroup__isnull=True).order_by('hostname'),
-    }
-    return render(request, 'server-list.html', data)
+    return render(request, 'server-list.html', get_server_list_context_data())
 
 
 @login_required
 def probe_list(request):
-    ProbeFormSet = modelformset_factory(Probe, form=ProbeForm)
-    data = {
-            'probe_form': ProbeForm(),
-            'probe_formset': ProbeFormSet(queryset=Probe.objects.all().select_related()),
-            'probes': Probe.objects.all(),
-            'groups': ServerGroup.objects.all().order_by('name'),
-            'nogroup_servers': Server.objects.filter(servergroup__isnull=True).order_by('hostname')
-    }
-    return render(request, 'probe-list.html', data)
+    return render(request, 'probe-list.html', get_probe_list_context_data())
 
 
 @login_required
@@ -61,6 +46,7 @@ def server_detail(request, server_id):
 
     form = ServerForm(instance=server)
     data = {
+            'graphtypes': GraphType.objects.all(),
             'server_form': form,
             'server': server,
             'groups': ServerGroup.objects.all().order_by('name'),