dropdown elements added, structure improved