Fixed controls and added options dropdown