Added curly brace support for menus and did other style fixes