Optgroups added, misc styling