working
recent
added white background to dropdown menu
fixed merge conflicts