Started changing things around so it uses the menubar block