Moved TODO note as an issue
Moving bookmark menu name as an option
Touching up indentation