Change drop-down, fix many minor issues