adding styling and drop-down
fixed conflicts