Started bookmark functionality (again)

Also removed some settings and added two.