Fixed issue with editing picks
Updated picks controller with cleaner code