Cleaned u some of the viewing, and minor bug-fixes. Secured function agains URL-injection