Misc define needs ui improvements