Add final touchups and fix the drop down bug