Fixed bug where bookmark button ID conflicted with search button ID. Small UI improvements.