Fix #5 and improve with dropdown