Added dropdown
Fixed controls instanciation
Added tests