Fixed breakage involving the more button, cleaned up some old stuff, gave up trying to stop the next favorite button jump to a new window