fixed bug with bookmarks, made form and table look nicer
Merge branch 'upgrades'