Styles enhancement

1. Added spinners
2. Modified the options