Improve styling of defaul/shelf options