Fixes for FF20 and remove ugly menu seperators