Removed the hover listener in Janeway; may need to undo this if marty says no.
Changed borders of the toolbar panel; changed order; need to refactor to keep order everywhere in it.