Added the remaining content-minus the form- and fixed some bugs