Annotated; improved dropdown positioning