Flattened options widget and other small changes