Adds possibility to toggle beaming
Renames function to be consistent
Moves bookmarking button below and adds possibility to just bring up the enrichment screen